From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 4 Dec 2024 09:07:47 +0000 (+0800)
Subject: shell_integration/macOS/FileProviderUIExt: Adapt FileProviderUIExt Locking to Nextclo... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~90^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=60451870b1190cc2b6c1a3458ec85978ed3cbd5f;p=nextcloud-desktop.git

shell_integration/macOS/FileProviderUIExt: Adapt FileProviderUIExt Locking to NextcloudKit 5

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
index f7347848a..d93e2ec17 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
@@ -157,16 +157,20 @@ class LockViewController: NSViewController {
                 return
             }
             let serverPathString = serverPath as String
-            let kit = NextcloudKit()
-            kit.setup(
+            let kit = NextcloudKit.shared
+            kit.appendSession(
+                account: account.ncKitAccount,
+                urlBase: account.serverUrl,
                 user: account.username,
-                userId: account.username,
+                userId: account.id,
                 password: account.password,
-                urlBase: account.serverUrl
+                userAgent: "Nextcloud-macOS/FileProviderUIExt",
+                nextcloudVersion: 25,
+                groupIdentifier: ""
             )
             // guard let capabilities = await fetchCapabilities() else {
             guard let itemMetadata = await fetchItemMetadata(
-                itemRelativePath: serverPathString, kit: kit
+                itemRelativePath: serverPathString, account: account, kit: kit
             ) else {
                 presentError("Could not get item metadata.")
                 return
@@ -200,7 +204,8 @@ class LockViewController: NSViewController {
                 kit.lockUnlockFile(
                     serverUrlFileName: serverUrlFileName,
                     shouldLock: locking,
-                    completion: { _, error in
+                    account: account.ncKitAccount,
+                    completion: { _, _, error in
                         continuation.resume(returning: error)
                     }
                 )